luci-base: override the load() function to return boolean for FlagValue

In the underlying uci system, all variables are effectively strings, so
for those configuration values which serve as 'boolean' flags, we need
to coerce the various forms into a real boolean. Only the following
string values result in true: 1|on|true|yes|enabled. Otherwise, false.

Checkboxes now fill correctly.

"Unchanged" configurations may write changed values as the Flag values
are coerced to '1' or '0' on write, but the configuration behaviour
remains synonymous.

Signed-off-by: Paul Donald <[email protected]>

diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index c9af17f1b37e1e71fa3610c3d0d8895d9b2332d8..cccfcdda929067f9db85895fdb3519f483374b8d 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -4199,6 +4199,19 @@ const CBIFlagValue = CBIValue.extend(/** @lends LuCI.form.FlagValue.prototype */
         * @default 'ℹ️';
         */
 
+       /**
+        * Coerce the various forms of a 'boolean' string into a true/false value.
+        *
+        * @override
+        */
+       load() {
+               // 
+               let load = this.super('load', arguments);
+               if (typeof(load) == 'string')
+                       load = ['1', 'on', 'true', 'yes', 'enabled'].includes(load.toLowerCase());
+               return load;
+       },
+
        /** @private */
        renderWidget(section_id, option_index, cfgvalue) {
                let tooltip = null;